From 57c8cb2125af4c1db6381529b38cae3561b0436a Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Thu, 9 Jun 2005 09:00:58 +0000 Subject: [PATCH] bitkeeper revision 1.1662.1.20 (42a8054awYd-HJnwjnXqXtWmKbE1Yw) SrvDaemon.py: Disable kill of xenstored on xend exit. xu.c: Set error reason in failure case. Signed-off-by: Christian Limpach --- tools/python/xen/lowlevel/xu/xu.c | 3 ++- tools/python/xen/xend/server/SrvDaemon.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/lowlevel/xu/xu.c b/tools/python/xen/lowlevel/xu/xu.c index c9c5b3873a..359cb71a2d 100644 --- a/tools/python/xen/lowlevel/xu/xu.c +++ b/tools/python/xen/lowlevel/xu/xu.c @@ -1370,7 +1370,8 @@ static PyObject *xu_port_new(PyObject *self, PyObject *args, PyObject *kwds) fail1: PyObject_Del((PyObject *)xup); - return NULL; + PyErr_SetString(PyExc_ValueError, "cannot create port"); + return NULL; } static PyObject *xu_port_getattr(PyObject *obj, char *name) diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py index c52a8acb9d..133df206b9 100644 --- a/tools/python/xen/xend/server/SrvDaemon.py +++ b/tools/python/xen/xend/server/SrvDaemon.py @@ -130,7 +130,7 @@ class Daemon: def cleanup(self, kill=False): self.cleanup_xend(kill=kill) - self.cleanup_xenstored(kill=kill) + #self.cleanup_xenstored(kill=kill) def status(self): """Returns the status of the xend daemon. -- 2.30.2